From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Wed, 31 Dec 2014 15:59:16 +0000 (+0000)
Subject: Merge "Use PHPUnit_Framework_TestCase in a few utils/ tests"
X-Git-Tag: 1.31.0-rc.0~12827
X-Git-Url: http://git.cyclocoop.org/%27%20.%20%24prefix%20.%20Wiki::transformTitleToURI%28%24matches%5B1%5D%29%20.%20%27?a=commitdiff_plain;h=0f520f5e1d273c1de827f6ae84b44b1e76ac7330;hp=855fb87dcf39b8bf00dbe76066701b780509ed0d;p=lhc%2Fweb%2Fwiklou.git

Merge "Use PHPUnit_Framework_TestCase in a few utils/ tests"
---

diff --git a/tests/phpunit/includes/utils/IPTest.php b/tests/phpunit/includes/utils/IPTest.php
index ebe347fd75..09c1587de8 100644
--- a/tests/phpunit/includes/utils/IPTest.php
+++ b/tests/phpunit/includes/utils/IPTest.php
@@ -9,7 +9,7 @@
  * dataprovider.
  */
 
-class IPTest extends MediaWikiTestCase {
+class IPTest extends PHPUnit_Framework_TestCase {
 	/**
 	 *  not sure it should be tested with boolean false. hashar 20100924
 	 * @covers IP::isIPAddress
diff --git a/tests/phpunit/includes/utils/StringUtilsTest.php b/tests/phpunit/includes/utils/StringUtilsTest.php
index 0fdb8e1594..7c24fae6d5 100644
--- a/tests/phpunit/includes/utils/StringUtilsTest.php
+++ b/tests/phpunit/includes/utils/StringUtilsTest.php
@@ -1,6 +1,6 @@
 <?php
 
-class StringUtilsTest extends MediaWikiTestCase {
+class StringUtilsTest extends PHPUnit_Framework_TestCase {
 
 	/**
 	 * This tests StringUtils::isUtf8 whenever we have the mbstring extension
diff --git a/tests/phpunit/includes/utils/ZipDirectoryReaderTest.php b/tests/phpunit/includes/utils/ZipDirectoryReaderTest.php
index 34ffb5352c..05d07d45af 100644
--- a/tests/phpunit/includes/utils/ZipDirectoryReaderTest.php
+++ b/tests/phpunit/includes/utils/ZipDirectoryReaderTest.php
@@ -4,7 +4,7 @@
  * @covers ZipDirectoryReader
  * NOTE: this test is more like an integration test than a unit test
  */
-class ZipDirectoryReaderTest extends MediaWikiTestCase {
+class ZipDirectoryReaderTest extends PHPUnit_Framework_TestCase {
 	protected $zipDir;
 	protected $entries;